Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 25, 2022

This is an automatic backport of pull request #2407 done by Mergify.
Cherry-pick of 5769e7f has failed:

On branch mergify/bp/7.17/pr-2407
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 5769e7fb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .ci/Jenkinsfile
	modified:   .ci/ansible/playbook.yml
	modified:   .ci/ansible/tasks/runners.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/aws-instances-reaper.groovy

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 5769e7f)

# Conflicts:
#	.ci/aws-instances-reaper.groovy
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Apr 25, 2022
@mergify mergify bot assigned v1v Apr 25, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Apr 25, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-04-26T08:44:08.897+0000

  • Duration: 64 min 56 sec

Test stats 🧪

Test Results
Failed 0
Passed 311
Skipped 0
Total 311

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@mdelapenya mdelapenya added backport-skip Skip notification from the automated backport with mergify and removed conflicts There is a conflict in the backported pull request labels Apr 26, 2022
@mdelapenya mdelapenya merged commit c26f6f2 into 7.17 Apr 26, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-2407 branch April 26, 2022 10:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport-skip Skip notification from the automated backport with mergify

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants